From: Matthias Clasen Date: Wed, 28 Jan 2015 15:08:13 +0000 (-0500) Subject: Fix a typo X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~7839 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1aee4f038448b79ebbc6fb6925aec2dfbe71f3c9;p=gtk%2B3.0.git Fix a typo commit aa1b7fab9c6a2b39 introduced a misuse of G_UNLIKELY in several places. Fix all those. --- diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 6d0777cc16..a61dd1ed5e 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -4461,7 +4461,7 @@ gtk_text_view_style_updated (GtkWidget *widget) GtkStyleContext *style_context; const GtkBitmask *changes; - if (G_UNLIKELY (affects_font) == NULL) + if (G_UNLIKELY (affects_font == NULL)) affects_font = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_FONT); text_view = GTK_TEXT_VIEW (widget); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 7b97c0023d..f43231f50d 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -8707,7 +8707,7 @@ gtk_tree_view_style_updated (GtkWidget *widget) GtkStyleContext *style_context; const GtkBitmask *changes; - if (G_UNLIKELY (affects_size) == NULL) + if (G_UNLIKELY (affects_size == NULL)) affects_size = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_CLIP); GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->style_updated (widget); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index b7fa3670a5..fc1d2ff88e 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -8231,7 +8231,7 @@ gtk_widget_real_style_updated (GtkWidget *widget) { static GtkBitmask *affects_size = NULL; - if (G_UNLIKELY (affects_size) == NULL) + if (G_UNLIKELY (affects_size == NULL)) affects_size = _gtk_css_style_property_get_mask_affecting (GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_CLIP); if (changes == NULL || _gtk_bitmask_intersects (changes, affects_size))